From 7490cd39b79063c2d8e42f0cafaff6d2a62172d7 Mon Sep 17 00:00:00 2001
From: Alex Williamson <alex.williamson@hp.com>
Date: Thu, 24 May 2007 14:20:19 -0600
Subject: [PATCH] [IA64] Don't scrub pages when on SN2 simulator

Small patch to not call scrub_heap_pages() when running on Medusa.
Can't use the running_on_sim flag for this as that flag impacts too
many other things that make it fail for us.

Signed-off-by: Jes Sorensen <jes@sgi.com>
---
 xen/arch/ia64/xen/xensetup.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/xen/arch/ia64/xen/xensetup.c b/xen/arch/ia64/xen/xensetup.c
index 413ae033f2..d40976b46d 100644
--- a/xen/arch/ia64/xen/xensetup.c
+++ b/xen/arch/ia64/xen/xensetup.c
@@ -29,6 +29,7 @@
 #include <xen/softirq.h>
 #include <xen/rcupdate.h>
 #include <acm/acm_hooks.h>
+#include <asm/sn/simulator.h>
 
 unsigned long xenheap_phys_end, total_pages;
 
@@ -553,7 +554,7 @@ printk("num_online_cpus=%d, max_cpus=%d\n",num_online_cpus(),max_cpus);
   			0) != 0)
         panic("Could not set up DOM0 guest OS\n");
 
-    if (!running_on_sim)  // slow on ski and pages are pre-initialized to zero
+    if (!running_on_sim && !IS_MEDUSA())  // slow on ski and pages are pre-initialized to zero
 	scrub_heap_pages();
 
     init_trace_bufs();
-- 
2.30.2